Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFR] Fix filter conflict #663

Merged
merged 2 commits into from
Sep 4, 2015
Merged

[RFR] Fix filter conflict #663

merged 2 commits into from
Sep 4, 2015

Conversation

ThieryMichel
Copy link

No description provided.

jpetitcolas added a commit that referenced this pull request Sep 4, 2015
@jpetitcolas
Merge pull request #663 from marmelab/fix_filter_conflict
f0ecf4f 
[RFR] Fix filter conflict
@jpetitcolas jpetitcolas merged commit f0ecf4f into master Sep 4, 2015
@jpetitcolas jpetitcolas deleted the fix_filter_conflict branch September 4, 2015 08:04
fzaninotto added a commit that referenced this pull request Sep 4, 2015
@fzaninotto
Fix #663 in a better way
5adc465
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ThieryMichel @jpetitcolas